Skip to content
This repository was archived by the owner on Dec 26, 2020. It is now read-only.

add SmartOS support #294

Merged
merged 3 commits into from
Jul 28, 2020
Merged

add SmartOS support #294

merged 3 commits into from
Jul 28, 2020

Conversation

aqw
Copy link
Contributor

@aqw aqw commented Jun 20, 2020

In addition to a new SmartOS.yml var file, this PR makes configurable the location of sshd (sshd_path) and ssh host keys (ssh_host_keys_dir).

The introduction of ssh_host_keys_dir is not strictly necessary, as the user can specify ssh_host_key_files. For that reason, I split it into its own commit, so you can cherry-pick around it if you so choose. However, I felt adding it was preferable, as it will work out-of-the-box, and doesn't require the user to keep ssh_host_key_files and ssh_host_key_algorithms in sync.

Neither of these were added to the README, as it seems to focus on user-visible variables, which neither of these are.

@aqw aqw force-pushed the master branch 3 times, most recently from 68702af to cd1f4e4 Compare June 20, 2020 11:46
@aqw
Copy link
Contributor Author

aqw commented Jun 20, 2020

Pushed fix for linting and removal of trailing /.

The Fedora failure is unclear to me. Perhaps spurious?

@aqw
Copy link
Contributor Author

aqw commented Jun 23, 2020

I did a force push (no changes) to kick off CI again. Indeed, the Fedora failure was spurious. All tests pass.

@rndmh3ro
Copy link
Member

Hey @aqw the Fedora tests are unrelated, you can ignore them.

I'll check out your PR!

@rndmh3ro rndmh3ro self-assigned this Jun 23, 2020
@aqw
Copy link
Contributor Author

aqw commented Jun 25, 2020

Pushed to add SmartOS to meta/main.yml and not remove --- heading from var files.

@aqw
Copy link
Contributor Author

aqw commented Jul 20, 2020

A friendly ping. Just let me know if anything needs to be reworked. :-)

@rndmh3ro
Copy link
Member

Sorry, I haven't had a chance to look at this yet.
I will probably not merge the location variables, however adding smartos support sounds good. Do you have a way to do automatic tests for this OS?

@aqw
Copy link
Contributor Author

aqw commented Jul 20, 2020

No worries. :-)

Re tests: It looks like you're using Travis to spin up Docker instances. SmartOS descends from Solaris, and Travis itself has no direct support for it. I think this will have to be like the *BSD platforms and remain untested. :-/

@rndmh3ro
Copy link
Member

On further consideration I'll merge the whole PR if you can fix the conflicts. :)

@aqw
Copy link
Contributor Author

aqw commented Jul 28, 2020

I'll take a look at this today.

@aqw
Copy link
Contributor Author

aqw commented Jul 28, 2020

The patches have been refreshed.

@rndmh3ro rndmh3ro merged commit f50f22c into dev-sec:master Jul 28, 2020
@rndmh3ro
Copy link
Member

Thank you!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants